XDS fix + exception when parameters not compatible

See title :)
Merge branch 'pr/n108_wforums'
Merge branch 'pr/n107_anshul1912'
Merge -xds willem changes
corrected typo cxx to ccx