Editor updates calendar
merged