Prevent leaked global from edit form
Merge pull request #2159 from darkwing/strict-edit-cleanup

Prevent leaked global from edit form