Merge branch 'main' into FhG/multichannel-jbm