Upstream version 20190516