Upstream version 20190816