Client validation hack
Merge branch 'dev'