Xconf gen

Merged Chris Hines requested to merge xconf-gen into master

Merge request reports