Sync from GitHub master (2a0b7bb16638c9f52a7b4c6a0f104e12eccb43b7) (part 2) 6f1b553 verified system HF Staff commited on Jul 15