CFY-1185 fix blueprints