Merging fix for missing removed namespace and adding back in g.s