Synchronized with the source at 945962fff4fbc8736d758fe7d61b0ec7cacba15d.