[12716m] Part 2 of 5.4.1 updates. Thanks TC/OpenWOW and Dramacydal