Merge remote-tracking branch 'origin/main' into 1637_basop_port-mr-1501-from-float