upstream: 4ab21375993d50340f1d05d6743bf5da889caf35
