Testing graceful shutdown fixes

[dawidstrozak]

Jira link

See PROJ-XXXXXX

Change description

Testing done

Security Vulnerability Assessment

CVE Suppression: Are there any CVEs present in the codebase (either newly introduced or pre-existing) that are being intentionally suppressed or ignored by this commit?

• [ ] Yes
• [ ] No

Checklist

• [ ] commit messages are meaningful and follow good commit message guidelines
• [ ] README and other documentation has been updated / added (if needed)
• [ ] tests have been updated / new tests has been added (if needed)
• [ ] Does this PR introduce a breaking change