upstream: 68bce81c6240f79769819649ed9fc1169b474bf9