[SD-979] Vocabularies related changes.