Upstream version 21.10.0