Merge "Fixed sonar issues in RDN class"