CONN-1325 Updated with review comments..