Merge "Replace transitions to avoid unnecessary interruption handling" into main