Merge branch '2511_editor_alt_arrow_mark'