Merge branch 'main' into 2172_basop_fix-crash-with-igf-and-bw-switching-with-dtx