[Bug 225862] Merge Review: gsf-sharp