Fix to 83aaac5: copy changes into client/
Merge default