Add workspace ID to client view
Merge branch 'master' into builds
7.697