Merge branch 'gb/rebase-signoff'