Squashed 'client-side/' content from commit 4e696da

git-subtree-dir: client-side
git-subtree-split: 4e696da8c6c1bff1953b248eb01b64c6af4120fb
Merge commit '50831659f3e524944174d16bb39c6437c2ef960a' as 'client-side'