Upstream version 20190722