Merge branch...

Merge branch 'basop-2579-non-matching-variable-found-in-function-unclr_calc_corr_features_fx' into 'main'

Resolve "Non matching variable found in function unclr_calc_corr_features_fx()"

See merge request !3022