Merge branch 'iotssl-513-alerts' into development