Merge "Revert "Replace channel layout for 13.0"" into main