Merge pull request #5658 from neheb/e2guardian