Sync with c30cee.