Improved implementation of ticket #757
Reworked part of the editor code
Authored by: numere 2023-01-09
Parent: [r1298]
Child: [r1300]