Resolved Github Issue

Resolved #352, #353, #354, $356
Resolved Github Issue

Resolved #309
Merge pull request #361 from CTDisasterManagement/V8.9

V8.9 - Resolved Github Issue