Merging changes from the client release