Upstream version 20190812