Merge "Improve GSS reference processing."