Upstream version 20190716