BC-1147 #resolve - disable imageID and color
Merge remote-tracking branch 'origin/2.0.x'