resolve CIT-258
Merge branches 'master' and 'master' of https://github.com/EdgeComputing/cats