Upstream version 20190615