Reflect updates from 42c195670eb5ef2aa294bdc0221b4d6d321fae5a.