[backport] PR #7873 to 4.1

[jbudz]

• Have you signed the contributor license agreement?
• Have you followed the contributor guidelines?
• If submitting code, have you included unit tests that cover the changes?
• If submitting code, have you tested and built your code locally prior to submission with npm test && npm run build?
• If submitting code, is your pull request against master? Unless there is a good reason otherwise, we prefer pull requests against master and will backport as needed.

[epixa]

Seriously though, have you signed the contributor license agreement? Have you followed the contributor guidelines?

[jbudz]

Whoops my pull request isn't against master, I'm not doing the last bullet point right

[epixa]