Upstream version 22.9.0