Merge changes from topics "rename_display_name_source", "sdbm"

* changes:
  Improved debug message
  Fixed equals and hashCode
  Renamed name source to display name source