Project: datamanagement
Issue DM-6210: Improve OSX support
Story points: 16