Sync with 9922a5.