Merge branch 'main' into port-jbm-fix-basop-part