Upstream version 20190913