Updated for 5.4.7.x clients (Win & Mac, x86 & x64)