Reordered alerts to correctly show notifications with current state.
Merge remote-tracking branch 'origin/master'