Merge changes from topic "flags-cleanup" into main

* changes:
  [Part 3] Clean up references for flags from past release.
  [Part 2] Clean up references for flags from past release.
  [Part 1] Clean up references to flags from past release.