Merge branch 'main' into 396-use-correct-bandwidth-in-ism-dtx-cng