Merge remote-tracking branch 'origin/main' into 1631_basop-port-mr-1498-from-float