Merge branch '846-jbm-masa-dtx-sid-start-crashes' into 'main'

[Non-BE] Resolve "JBM MASA DTX sid start crashes"

See merge request !1135