Merge "Revert "Remove refererence from public API to flagged API"" into main