Synchronized with the source at 1c3a5e28f332ff0f45c4c1d500f24c2e10307831.