Sync with 68793f.