Merge branch '1601_basop_port_fl1354' into 'main-pc'
Port Float MR 1354 to main-pc See merge request !1609
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 Float MR 1354 to main-pc See merge request !1609