Fixed disappearing grant button.
Merge branch 'test' into dev