Merge branch '2543_hexview_cursor_position'