Merge "PMS, Enabling json schema validation"