GlobalTermDictionary: not the right class, but its written
Merge remote-tracking branch 'origin/develop' into develop