Create ViewModels directly after injection

Merged Sebastian requested to merge 1914-create-viewmodels-directly-after-injection into master
Edited by Sebastian

Merge request reports