Aux38 alerts updates
Merge pull request #1512 from rwike77/working

Aux38 alerts updates.