Merge branch 'main' into 730-directivity-pattern-id-not-set-correctly