Upstream version 20191024