Merge "Merge "Fix bounds calculation" into oc-dev am: d1422b56ad am: 395d9acb46"