Synchronized with the source at dd0d3d21b106c9610997d852601f575f5ccc04f9.