WL-2652 response to code review