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

[non-BE] Resolve "JBM and DTX interaction not as expected"

See merge request !2040