Merge remote-tracking branch 'origin/main' into nokia/contribution-42-masa-prerend