new editor mode

(cherry picked from commit d42ee690be899b18b90b0e5c37dc7d37c9aafa03)