Merge "Add withLegacySuppressor helper method." into main