Merge "Purge OmniGears from Settings" into p9.0