CMS7-7986: prepare for next development iteration