Upstream version 20191030