Syncing 1.6.2 version