calender update
Merge remote-tracking branch 'origin/calender_fix' into DEV_Branch-2