Merge "New editor flow (for master)"