Merge branch 'controlled_vocab'