Backport calendar exception handling fixes

cherry picked :

Edited by Dominique MICHEL

Merge request reports

Loading
Loading