[DF-1619] Changes for task. Mac Os. (reverse-merged from commit f5141797feefba9417b15080110b6148bb2b308a)