WL-2640 response to code review