Modified the User Agent based on the client
Merge branch 'release' into dev