Merge branch 'management-fixes' into develop
Merge branch 'develop'