Merge pull request #1463 from webdetails/SP-1254

[SP-1254] - Regression PIR-994 - Fixed encoding issue with Metadata doma...