Upstream version 20190614