Merge "Add xtext adapter feature (2)"