Merge "Change Client Wrapper Constructor"