Merge "Restrict channel range in ACS"