Merging chat fix on dev branch with solving conflicts. However you need to have look on UserComparatorTest because it is failing. Looks like comparator is wrong.