Wrap up Module Owners plugin merge