Merge branch '2035_toggle_syntax_highlighting_shortcut'