Merge branch '1635_ref_cleanup' into 'ivas-float-update'
Port MR 1509 to ref See merge request !1962
WARNING! Gitlab maintenance operation scheduled for Saturday, 27 September 2025, from 07:00 AM to 4:00 PM GMT (09:00 AM to 6:00 PM CEST)
Port MR 1509 to ref See merge request !1962