upstream: 7d7b2990c9c428a5d87d128ae6a2106ea489703c
