Feature/#310 switching scenes

Jan Delemberrequested to merge
feature/#310_switching_scenes into develop

Additional review by @jwendt and @ademiralp

Merge request reports