Merge pull request #2073 from anandpdoshi/anand-august-18

[fix] Leave Application Calendar - Fixes #2065