Merge branch 'pw/diff-color-moved-ws-fix'