Sync with b2ba9a6.