Merge branch 'feat/calendar-improvements' into 'master'