CFY 1187 fixes to use existing feature