Merge branch '2135_viewer_jump_to_eof'