Remove redundant collations
Merge branch 'release/1.5' into develop