CMS7-8134: prepare for next development iteration