Merge pull request #7839 from KanchanChauhan/holiday-cal-fix

[Fix] Holiday Calendar Fix