Merge "Channel initializer class hierarchy refactor"