Further work on client version

3 jobs for james-dev in 4 seconds