1st MR related to the sequence of handover MRs (MR !2111)
This MR fixes the existing regression in develop.