Improve mods namespace handling
Merge branch 'develop' for 4.6.2 release