Upstream version 20190714