Handle Image color removed
Fix
Merge commit '417f631c3c38de56bead1b4ff674a10e2a369f4c'