Upstream version 20190817