Merge changes from topic "transfer_initiator_fix" into main

* changes:
  Fix output switcher initiator data
  Fix comparison of route id with original route id