CONN-587; CR comments addressed