Sync with 1.6.5.5