Merge branch '397_mouse_click_column_heading'