"CMS7-7080: prepare for next development iteration