Upstream version 20190211