Merge upstream client changes