cherry pick install from master with Sergey's osx notes