Merge remote-tracking branch 'origin/main' into nokia/contribution-40-masa-descriptive-meta