Merge branch 'zecke/features/dynamic-codec-switch'