Merge remote-tracking branch 'remotes/origin/main' into 2051-basop-PortMr2059-from-float-renderer-granularity-revision