incorporate changes from nlp-pipeline