Merge "Fixed sonar issue in DelegateDAO"