Merge "Revert "EdgeExtension: Add a missing flag check"" into main