CFY-196 merge