Bring 'add-bin-feature-flag' into 'master'

What does this MR do?

This brings this MR that got reverted by: !35910 (merged)

Does this MR meet the acceptance criteria?

Conformity

• Changelog entry
• Documentation (if required)
• Code review guidelines
• Merge request performance guidelines
• Style guides
• Database guides
• Separation of EE specific content