Merge "Improve notification and dump formatting of FlagDependencies" into main