CONN-1131 PR comments response for DAO