Merge branch '2956_mouse_protocol_1006'