CFY-1373 diamond plugin branch