Sync with 19f1d74.