Merge "Disable channel id" into m39