Merge branch '2881_editor_offset_after_tab' into 4.8.1-stable