CONN-1368: More format changes