Merge remote-tracking branch 'origin/main' into nokia/fix-hrb-masa-metadata