Merge "Add xtext adapter feature (4)"