1:1 editor implementation XII (before integration into master)