Merge "On reconfiguration, re-enqueue items at the same position" into feature/zuulv3