Change #483335 Build #247187 - test client fixes