Rebase sg

Same as my metacomments