Sync with 6.1.2