Replaced lifestuff references with client.
Merge branch 'next' into vault