Upstream version 20190210