Merge "Updating rotation transaction behaviour" into rvc-dev