Merge branch '2005_viewer_hex_mode_edit_fix'