Merge branch 'feature/check_so_files_on_osx'
Merge branch 'feature/update-osx-health-check-whitelist'