Merge branch 'main' into 1640_basop_port-mr-1347-from-float