Upstream version 2019~U7