Upstream version 20191019