GRAS-1143 partially resolved/progress commit