CMS7-8130: prepare for next development iteration