Merge Feature/emergency notifications into Test #77

Closed Henrynaut closed 3 years ago