Update ModuleManager.php
Merge branch 'hotfix/get-called-class-changes' into develop

Forward port #4236
Forward port #4237