CONN-1368: Modified