Small public fixes in controllers and templates
Merge branch 'local-fix' into develop
Updated Version 3.1.46.127