This is a merge of a topic branch containing the support for the new
channel map API using control elements.