Merge branch 'main' into basop-issue-812-fix-nan-cohsnr