Merge branch 'main' into basop-2346-review-potentially-duplicated-igf-functions-2