Sync with 1.6