Upstream version 20190718