CLOUD-207 fixed blueprints