calender: update from bttf branch