VG-1540: Support for OSX