Updated to support 5.4.1.x x86 client