Added missing grid statements and clear
Merge branch 'master' into release