Merge branch 'feature/name-phrase-grounding' into 'master'