Merge in GRIFFINCollaboration changes

Merge in GRIFFINCollaboration changes