CONN-691: Updated Matt's review comments.