Tasks: - [ ] Final review of #9857 - [ ] Run UTs, e2e locally - [ ] (Optional) Run a testnet to make sure no major breakage is introduced - [ ] Merge #9857 into `main` - [ ] Update documentation, such as state of ADR (if needed), update references to the backport feature branch DoD: - Branch `feature/adr075-backport` is merged - No major breakages, any minor issue is solved - Documentation up to date