Merge branch 'main' into 22-terminology-for-the-number-of-channels