Fix/4.0.x/cal 701

Backport from CAL-659 fix.