DAR-1068: Changes after code review part 2