Sync with aecc35.