Merge "Add remaining DPM constants"