CDB-233 #fixes Color/Category wizard image selector
Merge remote-tracking branch 'origin/feature/CDB-233' into release/2.4.0
Merge branch 'release/2.4.0' into release/2.4.0+