Pull in SGP norm group changes