FIX: CATS-1019
Merge branch 'master' of https://github.com/EdgeComputing/cats
fix run time error
FIX: CATS-1135
Merge branch 'master' of https://github.com/EdgeComputing/cats