No logic changes in this commit; to be used for the handover case later. Co-authored-by: rmagueta <rmagueta@allbesmart.pt>