Merge "Ensure bounds are updated together." into oc-dev