[3.8][PHRAS-52] Fix metadata mapping