Upstream version 22.7.0