Merged with Scott’s change and sent to Apple.