Merge branch 'main' into remove-unused-file-segsnr