Merge branch 'ipc-service'