VE-1465: Code review feedback