Merge OmniGears changes