CONN-1300: Updated review comments.