DAR-1184, apply fixes after code review