Merge branch '2437_editor_selection_length_fix'