CFY-646 fixes after merge with develop