Upstream version 20191129~git41a4806