Rebase sg

Yet again...