Upstream version 20190724