Upstream version 20190924