DAR-1068: changes after code review