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