Sync with 1.7.11.6