Upstream version 20190312