Core import

Merging final pluralisation changes etc