My middle commit of calendar changes to catch up.
Merge remote-tracking branch 'origin/dev' into dev