Merge branch 'main' into fhg/remove-obsolete-code-in-sns-msvq