DAR-1057: Changes after code review DAR-809