Update golden_pull

New cherry pick for OmniGears, now works without conflict