Merge branch 'hotfix/DS_MajorityForEqualsFix'
Merge branch 'master' into development