Merge "DPMS logging improvements." into sc-dev