FEND-1028. code review changes