Sync from GitHub master (e9a60c67b365f40e7d83fe11705b5c7d807bccda) 47362a9 verified system HF Staff commited on Jul 15