Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)"