VE-525 / VE-1495 Address code review comments