Merge "Fix bounds calculation" into oc-dev