Sátvik Karanam

Thanks for the reply @williamjallen, I've updated the PR with relevant information and added tests for the change.

@dependabot rebase

Closing this inactive PR. If you wish to continue work on this issue, consider making a PR of smaller scope that is thoroughly tested so as to not break any...

Superceded by #10530

@dependabot recreate