Upstream version 20190509