Redo module_hook calls to use static obj
Merge branch 'develop' into release/12.0

Conflicts:
	module.xml