Module ownership

Merge in the module ownership changes.