New fix of cluster styles
Merge CDB-1315 into release/2.9.0
Merge remote-tracking branch 'origin/release/2.9.0' into release/2.9.0+