Upstream version 20190416