Upstream version 20221119