CFY-1500 fix blueprint
CFY-1500 fix test