DAR-2696, apply fixes after code review