Port universalOSX changes to dev/master

Port universalOSX changes to dev/master