Merge branch 'ds/add-i-color-configuration-fix'