fix for empty securities
Merge branch 'newgrants' into testing