Merge branch 'refs/heads/fix-for-DST-issues'
Merge remote-tracking branch 'refs/remotes/origin/extensible-feature-agenda-view3'