Upstream version 20190919