FEND-1208. code review changes