Merge remote-tracking branch 'origin/ivas-float-update' into...

Merge remote-tracking branch 'origin/ivas-float-update' into 1894-port-osba-fixes-basop-298-355-360_port-to-float-update