Merge tag '3.22.02.11' into ipc-next