[550085] Integrate features from the Generic Editor
16 files changed