set IncludeExceptionDetailInFaults to true
Merge branch 'master' of https://github.com/EdgeComputing/cats
resolve conflict
resolve conflict