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