Merge remote-tracking branch 'origin/main-pc' into 1640_basop_port-mr-1347-from-float