Merge branch 'main' into basop-2642-possible-bug-in-function-ivas_calculate_abs_fr