Merge tag 'v1.9.22' into LADI/main