Sync with 1.6.4.2