Upstream version 20190104