[DF-1619] Changes for task. Mac Os.