Refactoring for app level error handling
Merge branch 'development' into vs_131