Eddy patch

Taylor Hanayikrequested to merge
eddy-patch into master

Merge request reports