Merge "Fix bounds rotation logic" into nyc-mr1-dev