upstream: 4a8e1e081701c95a7f2d27eff2d2a9ee96691edc