Upstream version 20191015