GEP-21 Fixed issue where grants were not being saved if Draft mode enabled