Merge branch 'main' into lower-memory-usage-of-ssnr-implementation