changed the hashcode who likes to sonar
Merge origin/master