Merge "Fix ChangeTransform to work with interruptions" into lmp-dev