Merge branch '1953-ref-PortFlpMr2029' into 'ivas-float-update'
Port MR2029 from float to FLP-ref See merge request !2148
WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.
Port MR2029 from float to FLP-ref See merge request !2148