Merge "Workaround for delayed reset-transform transaction" into rvc-dev