New fix of cluster styles
Merge CDB-1315 into release/2.9.0