am 2e572064: Merge "4373 & 4374 part of Severe Alerts"

* commit '2e572064f74d19a91436c6ff7723c9a18230f954':
  4373 & 4374 part of Severe Alerts