Merge "Attempt to clarify some of the module counts" into oc-dev