Merge "Fix bounds rotation logic"