GRAS-1143 progress commit