Upstream version 20190626