New Omnibus

Merged username-removed-5302 requested to merge new_omnibus into master