Sync up with the partial branch version of this file.