fix PHRAS-52
Merge pull request #1051 from jygaulier/fix-phras-52

[3.8][PHRAS-52] Fix metadata mapping