temporary fix for "No alert is present" error
Merge remote-tracking branch 'origin/master'