merged event viewer pull request