Update dev client to 1.7.0beta4
Merge branch 'master' into live