Merge "Destroy() client after onClientFinished." into sc-dev