Upstream version 20190320