Merge with Grants updates