Merge changes I5b2ee38d,I5270eaf8 into main

* changes:
  Prevent elements from jump-cutting after an interruption
  Move Transition test utils to tests source folder