Merge "Establish flag dependency on suppression refactor" into main