Champion DTO added
Merge origin/master into XK