Upstream version 20221218