LOG-2869 code review changes