Merge branch 'client_dev' into development