Commiting some updates based on the later scenario work.
Authored by: emlarsson 2021-02-12
Parent: [r6445]
Child: [r6447]