Upstream version 20190315