Merge branch 'ws/rebase-p'