Upstream version 20190103