CONN-1143 Update for CSS