VE-1577 Code review feedback