Merge "Fix bug #2846543 Delete HIDDEN column from the "Calendars" table"