Merge remote-tracking branch 'origin/main' into 1636_basop_port-mr-1502-from-float