Re-integrate GSS, refs #3