Merge branch 'develop-Calibration_fix_NA' into 'hotfix-5.0.0'

Correct Bug in Calibration when having a grid point with no observations

See merge request !158