Merge branch '2662_extended_mouse_clicks'