CONN-875 Modifications