COMP: fix module ordering
Merge branch 'bug-18528-FixModuleOrder'