Merge remote-tracking branch 'remotes/origin/main' into 557-crash-in-ism-dtx