Merge "Support safe mode properly." into nyc-dev