CONN-800:Address PR comments