Upstream version 20190709