Merge branch 'main' into basop-2575-regression-with-nonbe_fix_issue_2518