Sync with 1.7.9.1