Upstream version 20190603a