CONN-443: Updates per code review comments.