Fix/4.0.x/cal 685