Update to latest client side changes

Rebase of #269.