Merge tag '3.00.02.26' into ipc-next