Move handling of colorsUsed into Solution
Merge branch 'master' into pilot
Remove adjustment of usedColors