CDK-597: prepare for next development iteration