Merge "Fix security vulnerability in DPMS" into sc-dev