follow up patch for Bug 947094 - [Calendar]
Merge pull request #15177 from pivanov/bug-947094-followup

follow up patch for Bug 947094 - [Calendar]