CONN-853i: Updated with review comments.