Moving topic from old guide per CDK-753