Merge remote-tracking branch 'origin/3.40' into ipc-next