partial fix for calendar
[Core] Merged Latest Three updates