NVR-009: another commit