Merge branch 'main' into 1122-jbm-and-dtx-interaction-not-as-expected