Merge pull request #3136 from BrzVlad/fix-stw-stopped