Merge "API polish in DPM for organization color and name methods" into nyc-dev