WL-2652 Response to code review