Minor Fixes: Improvements to Schedule Check, Schedule update and Calendar Updates after refresh
Merge remote-tracking branch 'origin/master'