CATS-1024 and CATS-1025 Resolved
Merge branch 'master' of https://github.com/EdgeComputing/cats