Merge CountBy and Count functions
merge develop