Upstream version 22.4.0