DF Fixed some sonar and checkstyle bugs.
DF Fixed merge.