WL-2652 Fix mess with merge and code review
WL-2652 Fix code review comments