DS-5853 WIP from working on Xtext upgrade (completely broken state)