Sync with c156b2.