Merge branch 'feature/8131_calc_corr_update' into develop