CMS7-7909: prepare for next development iteration