Sync with c21a02.