Sync with c1f825.