Upstream version 20190828.git018590d