Merge "Fix some change-transition issues and tests" into rvc-dev