Upstream version 20190621