CDK-720: prepare for next development iteration