[563046] Fix regenerate editor problems
24 files changed