Update Mvc.php
Merge pull request #5082 from VitoNordloh/patch-1

Simplification
Merge branch 'feature/5082' into develop

Close #5082