Merge "Change date on CustomCalendar"