Fix/4.0.x/cal 526

Backport from UI-2665 fix.