Merge branch '1771_menu_hide_cursor'