Merge branch 'kb/maint-diff-ws-check'