V6.9.6 See merge request !34
# Conflicts: # js/haggle/components/HaggleList.js
V6.9.5 See merge request !33