0xrochimaru

Results 2 issues of 0xrochimaru

## Describe your changes Closes #2691 ## Indicate on which release or other PRs this topic is based on v0.34.0 ## Checklist before merging to `draft` - [x] I have...

merged to draft
ready for draft