Re-introduce One pluralization scheme
Merge branch 'fix-hu-pluralization' into develop