ERP-3759: Code review