Bugfix/macos client

Marek Szubarequested to merge
bugfix/macos_client into master

Created by: s-mm

Code changed to set up the environment for MacOS client.

Merge request reports