Upstream version 20190507