More small tweaks to module_admin
Merge branch 'develop' into release/12.0