Merge change 8884 into donut

* changes:
  DO NOT MERGE. Already in master. Fix calendar test.