newgrants polish
Merge branch 'newgrants' into testing