Sync with 656af5.