Description

Continuation of #368 to clean git history.

Type of change

Please delete options that are not relevant.

[ ] I ran go generate
[x] I have performed a self-review of my own code (remember to run go fmt ./...)
[ ] I have commented my code, particularly in hard-to-understand areas
[ ] I have made corresponding changes to the documentation
[ ] I have added tests that prove my fix is effective or that my feature works
[ ] New and existing unit tests pass locally with my changes
[ ] Any dependent changes have been merged and published in downstream modules
[ ] Added benchmarks if this is a performant required component (potential bottlenecks)