Merge branch '2881_editor_offset_after_tab'