Sync from GitHub: 71b4e35efd6a40202ad9904ea8e1cdf66d0504ac 372e639 verified iyougame commited on Jan 13