CMS7-8167: prepare for next development iteration