#4403: og_vocab patch