Merge branch 'main' into basop-2580-static-value-used-instead-of-existing-variable-in-function-unclr_calc_corr_features_fx
