CMS7-8187: prepare for next development iteration