error handling generalization
Merge branch 'master' into dev
added global api status support
api status fixed
Merge branch 'dev'