CMS7-7915: prepare for next development iteration