Headers bps

[PastaPastaPasta]

Issue being fixed or feature implemented

Subset of #6097 to see if all issues are addressed by dropping a few commits

What was done?

How Has This Been Tested?

Breaking Changes

Checklist:

• [ ] I have performed a self-review of my own code
• [ ] I have commented my code, particularly in hard-to-understand areas
• [ ] I have added or updated relevant unit/integration/functional/e2e tests
• [ ] I have made corresponding changes to the documentation
• [ ] I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

[github-actions[bot]]

This pull request has conflicts, please rebase.