Merge "Move computation of decodeColor- Type and Space" into pi-dev