CFY-785 merge