Merge "Refactor color space attribute processing." into pi-dev