Merge "[Stateless SG] Fix usage of the default stateless SG"