Merge "Create new Edit Mode" into main