Merge http://infra-srv1.demorecorder.com/git/free-sw/xcb/proto