WIP: multiple changes

[ivanitskiy]

Proposed changes

This is a temporary PR to share changes. I intend to break it down into a few separated PRs

Checklist

Before creating a PR, run through this checklist and mark each as complete.

• [ ] I have written my commit messages in the Conventional Commits format.
• [ ] I have read the CONTRIBUTING doc
• [ ] I have added tests (when possible) that prove my fix is effective or that my feature works
• [ ] I have checked that all unit tests pass after adding my changes
• [ ] I have updated necessary documentation
• [ ] I have rebased my branch onto master
• [ ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork