CONN-286 regression improvements