Merge remote-tracking branch 'origin/704-dev-fix-ws-update-for-a-pinned-tree' into dev

Status Job ID Name Coverage
  Compile
canceled #15419
compile

 
  Test
canceled #15420
test