Merge branch 'thiagocsf-master-patch-59116' into 'master'

Feature flag clean-up is part of development, not maintenance

See merge request !140167



Merged-by: Thiago Figueiró <tfigueiro@gitlab.com>
Approved-by: Nate Rosandich <nrosandich@gitlab.com>
Approved-by: Wayne Haber <whaber@gitlab.com>
Approved-by: Caroline Simpson <csimpson@gitlab.com>
Reviewed-by: Thiago Figueiró <tfigueiro@gitlab.com>
Reviewed-by: Caroline Simpson <csimpson@gitlab.com>
Co-authored-by: Caroline Simpson <csimpson@gitlab.com>