Merge "Add xtext adapter feature"