Sync with 02f579.