To what issues does this refer? Does the addition of underscore in this PR introduce issues?