upstream changes for calendar/popover merged