upstream: 1d7af7c99f1b9cf120c116303c5c015eb866a7ff