Merge HexViewer changes