Upstream version 20191026