CFY-352: changes following CFY-818