Prevent overriding underscore variable

Merged Joost Rijneveld requested to merge refactor/underscores into master

Merge request reports