Sync with 1.7.4.2