Merge pull request #337 from CTDisasterManagement/V8.0

Resolved GitHub Issues
Merge pull request #338 from CTDisasterManagement/V8.1

Resolved GitHub Issues
nls
Resolved GitHub Issue

Resolved #333
Resolved Issues reported by Internal QA Team.