GRAS-1581 GRAS-1529 beforeSave hooks