Merge Fuzzy changes from eborden