Upstream version 20190227