Fix issues CIT-331 CIT-334
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats