Updated for 5.3.0.17128 clients