VE-1521 Code review feedback