Upstream version 20190515