CHANNELMGR-42: prepare for next development iteration