VE-1128: Code review feedback