Merged types_ipc.diff and types_main.diff