Fixed Rave alert construct.
Resolved merge conflicts.