Add missing metadata for feature flag

What does this MR do and why?

Describe in detail what your merge request does and why.

Add missing metadata :feature_flag as well as todo item for when flag is removed.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

• I have evaluated the MR acceptance checklist for this MR.