Cfy 1295 improvements

restore master