Changes made to alert table
Merge remote-tracking branch 'origin/master'