Sync with e41893.