Upstream version 20190317