Merge "Ignore transform if not set" into rvc-dev