3178 Commits (fix/editor-style)