#636 & #634: Implementing SAS for notification hubs and API adjustments