WL-2365 responses to code review