FEND-1144:code review changes