Merge branch 'pw/rebase-signoff'