Merge branch 'release/2.6.0'
removed uniq to prevent 500 error message
bumped version
fixed bug