[x] I added tests to cover any new functionality, following this guide
[x] Whenever I fix a bug, I include a regression test to ensure that the bug does not reappear silently.
[x] If I have added, changed, renamed, or removed an environment variable, I have updated the list of environment variables in the documentation and made the necessary changes to the validator script according to the guide
Description and Related Issue(s)
Resolves #2007
Checklist for PR author