Reflecting "haxxxx" recent 5.2 changes

eflecting "haxxxx" recent 5.2 changes for Elemental Shaman.