Handle Conflicting wid/client, client is in another workspace
Merge branch 'master' into builds
7.728