CDK-806: prepare for next development iteration