Merge branch 'bg/rebase-off-of-previous-branch'