Repository navigation
July 13th, Candidate - #36411
Merged
Merged
July 13th, Candidate#36411
Conversation
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What's Coming
.NET MAUI inflight/candidate introduces significant improvements across all platforms with focus on quality, performance, and developer experience. This release includes 110 commits with various improvements, bug fixes, and enhancements.
Activityindicator
[iOS/MacCatalyst] Fix ActivityIndicator frozen static frame when IsRunning is set to false by @SyedAbdulAzeemSF4852 in [iOS/MacCatalyst] Fix ActivityIndicator frozen static frame when IsRunning is set to false #36263
🔧 Fixes
Animation
[Windows] Fix PlatformTicker.Windows.cs — IsRunning always returns false by @HarishwaranVijayakumar in [Windows] Fix PlatformTicker.Windows.cs — IsRunning always returns false #35840
🔧 Fixes
Fix s_currentTweener++ in AnimationExtensions is not thread-safe, producing duplicate animation IDs by @HarishwaranVijayakumar in Fix s_currentTweener++ in AnimationExtensions is not thread-safe, producing duplicate animation IDs #35838
🔧 Fixes
[iOS]Fix Shadow Property Incorrectly Modifies Visual Transform Matrix for Border, ContentView, Layouts, and SwipeView by @devanathan-vaithiyanathan in [iOS]Fix Shadow Property Incorrectly Modifies Visual Transform Matrix for Border, ContentView, Layouts, and SwipeView #32851
🔧 Fixes
Shapes: Fix TransformGroup child subscription leaks by @HarishwaranVijayakumar in Shapes: Fix TransformGroup child subscription leaks #36150
🔧 Fixes
Blazor
[BlazorWebView] Fixed Allow force reload for URLs with dots in query parameters by @tw4 in [BlazorWebView] Fixed Allow force reload for URLs with dots in query parameters #29560
🔧 Fixes
BlazorWebView
Add UsePlatformHandler for custom BlazorWebView backends by @Redth in Add UsePlatformHandler<T> for custom BlazorWebView backends #34225
🔧 Fixes
AddMauiBlazorWebView()entirelyBorder
Fix StrokeDashArray on Border does not reset when set to null by @devanathan-vaithiyanathan in Fix StrokeDashArray on Border does not reset when set to null #29910
🔧 Fixes
CollectionView
Fix CollectionView grid spacing updates for first row and column by @KarthikRajaKalaimani in [Android]Fix CollectionView grid spacing updates for first row and column #34527
🔧 Fixes
[Android] - Fix KeepScrollOffset Behavior During Dynamic Item Additions in CollectionView by @prakashKannanSf3972 in [Android] - Fix KeepScrollOffset Behavior During Dynamic Item Additions in CollectionView #29255
🔧 Fixes
[iOS & macOS] Fixed IndicatorView square shape does not update on load or dynamically by @NanthiniMahalingam in [iOS & macOS] Fixed IndicatorView square shape does not update on load or dynamically #31291
🔧 Fixes
[Android] Fix CollectionView items not resizing after orientation change on Shell pages by @SyedAbdulAzeemSF4852 in [Android] Fix CollectionView items not resizing after orientation change on Shell pages #34420
🔧 Fixes
[Android] Fix grouped CollectionView grid row spacing regression by @Shalini-Ashokan in [Android] Fix grouped CollectionView grid row spacing regression #35782
🔧 Fixes
[iOS][CV2] Fix Rotating the Simulator causes the text on the collection view to disappear. by @devanathan-vaithiyanathan in [iOS][CV2] Fix Rotating the Simulator causes the text on the collection view to disappear. #32664
🔧 Fixes
[Android] Fix CollectionView KeepScrollOffset regressed after PR [Android] - Fix KeepScrollOffset Behavior During Dynamic Item Additions in CollectionView #29255 by @HarishwaranVijayakumar in [Android] Fix CollectionView KeepScrollOffset regressed after PR #29255 #35946
🔧 Fixes
Fixed [Windows] KeepScrollOffset Behavior Not Working as Expected in CarouselView by @Shalini-Ashokan in Fixed [Windows] KeepScrollOffset Behavior Not Working as Expected in CarouselView #29800
🔧 Fixes
[Android] CarouselView: Fix position jump when tapping non-Start aligned Entry by @praveenkumarkarunanithi in [Android] CarouselView: Fix position jump when tapping non-Start aligned Entry #34532
🔧 Fixes
[iOS/Mac][CV2] Fix CarouselView2 freezes with infinite loop when IsScrollAnimated=False by @SyedAbdulAzeemSF4852 in [iOS/Mac][CV2] Fix CarouselView2 freezes with infinite loop when IsScrollAnimated=False #35848
🔧 Fixes
[iOS, MacCatalyst] CollectionView: Fix grid spacing updates for first row and column by @KarthikRajaKalaimani in [iOS, MacCatalyst] CollectionView: Fix grid spacing updates for first row and column #34598
🔧 Fixes
[iOS & Mac] Fix NullReferenceException in CollectionViewHandler2 after handler restore when property changes by @SubhikshaSf4851 in [iOS & Mac] Fix NullReferenceException in CollectionViewHandler2 after handler restore when property changes #36073
🔧 Fixes
[CV2][iOS] Fix MeasureFirstItem measuring non-first cells by @devanathan-vaithiyanathan in [CV2][iOS] Fix MeasureFirstItem measuring non-first cells #36159
🔧 Fixes
[Android] CarouselView: Fix touch interception to delegate vertical swipes to nested views by @Dhivya-SF4094 in [Android] CarouselView: Fix touch interception to delegate vertical swipes to nested views #31790
🔧 Fixes
[iOS][CV2] Fix CollectionView2 on iOS iPad jumps/scrolls randomly when item size changes by @devanathan-vaithiyanathan in [iOS][CV2] Fix CollectionView2 on iOS iPad jumps/scrolls randomly when item size changes #32874
🔧 Fixes
Fix Android nested gesture ownership by @AdamEssenmacher in Fix Android nested gesture ownership #35863
🔧 Fixes
CollectionViewcan cancel child-owned horizontal gestures after Issue7814 parent handoff fix[Android] CarouselView: Fix scroll to last item after data reset in loop mode by @SyedAbdulAzeemSF4852 in [Android] CarouselView: Fix scroll to last item after data reset in loop mode #31672
🔧 Fixes
Core Lifecycle
[Android] Fix ActivityStateManager leaking lifecycle callbacks on Activity recreation by @Shalini-Ashokan in [Android] Fix ActivityStateManager leaking lifecycle callbacks on Activity recreation #36161
🔧 Fixes
ActivityStateManagerleaks lifecycle callbacks and multipliesPlatform.ActivityStateChangedevents after Activity recreationDatepicker
[Windows] Throws ArgumentOutOfRangeException on WinUI when setting MaximumDate to null by @SubhikshaSf4851 in [Windows] Throws ArgumentOutOfRangeException on WinUI when setting MaximumDate to null #35894
🔧 Fixes
Drawing
[Android] Fix RadialGradientBrush crash on Android when view has zero size by @SyedAbdulAzeemSF4852 in [Android] Fix RadialGradientBrush crash on Android when view has zero size #35781
🔧 Fixes
Fix memory leak when clearing shared PathSegments from PathFigure by @devanathan-vaithiyanathan in Fix memory leak when clearing shared PathSegments from PathFigure #35873
🔧 Fixes
PathFigure.Segments.Clear()leaksPathvisual trees when removed segments are sharedFix Path.Data and Path.RenderTransform visual tree leaks with shared resources by @devanathan-vaithiyanathan in Fix Path.Data and Path.RenderTransform visual tree leaks with shared resources #36097
🔧 Fixes
Path.Data/Path.RenderTransformleaksPathvisual trees when using shared app-levelPathGeometryorScaleTransform[Android][Windows] Fix GraphicsView passing fractional dirtyRect dimensions to IDrawable.Draw by @SyedAbdulAzeemSF4852 in [Android][Windows] Fix GraphicsView passing fractional dirtyRect dimensions to IDrawable.Draw #34564
🔧 Fixes
Fix GeometryGroup.Children.Clear() leaking shared child geometries by @devanathan-vaithiyanathan in Fix GeometryGroup.Children.Clear() leaking shared child geometries #36232
🔧 Fixes
GeometryGroup.Children.Clear()leaksPathvisual trees when removed child geometries are sharedFix for PathGeometry.Figures.Clear() leaks when clearing shared PathFigure instances by @BagavathiPerumal in Fix for PathGeometry.Figures.Clear() leaks when clearing shared PathFigure instances #36057
🔧 Fixes
PathGeometry.Figures.Clear()leaks when clearing sharedPathFigureinstancesEditor
Entry
[iOS/macCatalyst] Fix Entry cursor reset when typing with TextTransform by @SyedAbdulAzeemSF4852 in [iOS/macCatalyst] Fix Entry cursor reset when typing with TextTransform #36079
🔧 Fixes
[Android] Fix Entry password visibility when using Keyboard.Password by @jpd21122012 in [Android] Fix Entry password visibility when using Keyboard.Password #36280
🔧 Fixes
Essentials
[Mac] Fix for DeviceDisplay.MainDisplayInfoChanged event not getting raised by @HarishwaranVijayakumar in [Mac] Fix for DeviceDisplay.MainDisplayInfoChanged event not getting raised #31786
🔧 Fixes
Fix Android foreground geolocation update distance by @jfversluis in Fix Android foreground geolocation update distance #35783
🔧 Fixes
Bridge DI-registered Essentials implementations to static facades by @Redth in Bridge DI-registered Essentials implementations to static facades #35068
🔧 Fixes
Defaultproperties need a public registration mechanism - Every Essentials API (Preferences,FilePicker,SecureStorage, etc.) is inaccessible to custom backends without reflection hacks[iOS] Fix MediaPicker FullPath for PHPicker results by @jfversluis in [iOS] Fix MediaPicker FullPath for PHPicker results #35805
🔧 Fixes
Filepicker
[Windows] Fix FilePicker Returns wrong ContentType for *.webp files by @devanathan-vaithiyanathan in [Windows] Fix FilePicker Returns wrong ContentType for *.webp files #31913
🔧 Fixes
Flyoutpage
[Windows] FlyoutPage: Fix CollapsedPaneWidth mapping and updates by @devanathan-vaithiyanathan in [Windows] FlyoutPage: Fix CollapsedPaneWidth mapping and updates #33786
🔧 Fixes
General
Reduce boolean boxes across the framework by @pictos in Reduce boolean boxes across the framework #35596
[iOS] Respect InputTransparent when updating UserInteractionEnabled by @jfversluis in [iOS] Respect InputTransparent when updating UserInteractionEnabled #36305
🔧 Fixes
Gestures
[HouseKeeping] Fix inconsistant owner type of DropCommandProperty by @NirmalKumarYuvaraj in [HouseKeeping] Fix inconsistant owner type of DropCommandProperty #35776
[Android] Fix DragGestureRecognizer DragStarting Command/Event fired prematurely by @HarishwaranVijayakumar in [Android] Fix DragGestureRecognizer DragStarting Command/Event fired prematurely #35778
🔧 Fixes
Fix for GetPosition truncates fractional coordinates to integers In OnTapped Event on iOS and MacCatalyst by @SuthiYuvaraj in Fix for GetPosition truncates fractional coordinates to integers In OnTapped Event on iOS and MacCatalyst #35949
🔧 Fixes
Hybridwebview
Label
[Android] Fix crash in Label FormattedText span position recalculation with MaxLines/TailTruncation by @Shalini-Ashokan in [Android] Fix crash in Label FormattedText span position recalculation with MaxLines/TailTruncation #35964
🔧 Fixes
[iOS] Fix Font autoscaling does not work in realtime by @HarishwaranVijayakumar in [iOS] Fix Font autoscaling does not work in realtime #34445
🔧 Fixes
Layout
[Windows] Make Layout AutomationPeer internal + opt-in for screen reader tree by @kubaflo in [Windows] Make Layout AutomationPeer internal + opt-in for screen reader tree #35912
🔧 Fixes
Map
[Android] Fix MapHandler leaks when removed Pin instances are retained by app code by @SubhikshaSf4851 in [Android] Fix MapHandler leaks when removed Pin instances are retained by app code #35686
🔧 Fixes
MapHandlerleaks when removedPininstances are retained by app codeMenubar
Navigation
[iOS/Mac Catalyst 26] Fix NavigationPage content not extending behind floating glass tab bar by @SyedAbdulAzeemSF4852 in [iOS/Mac Catalyst 26] Fix NavigationPage content not extending behind floating glass tab bar #35523
🔧 Fixes
Fix incorrect DestinationPage in NavigationPage OnNavigatingFrom events by @Shalini-Ashokan in Fix incorrect DestinationPage in NavigationPage OnNavigatingFrom events #35733
🔧 Fixes
[Android] Restore OnBackButtonPressed interception support when using OnBackPressedDispatcher by @Dhivya-SF4094 in [Android] Restore OnBackButtonPressed interception support when using OnBackPressedDispatcher #35154
🔧 Fixes
Picker
Fix Picker reacts to data changes after the page is closed by @devanathan-vaithiyanathan in Fix Picker reacts to data changes after the page is closed #33733
🔧 Fixes
Fix Picker selection when SelectedItem is removed from ItemsSource by @jpd21122012 in Fix Picker selection when SelectedItem is removed from ItemsSource #34299
🔧 Fixes
RadioButton
Refreshview
[Android] Fix for Android RefreshView incorrectly triggering pull-to-refresh when scrolling inside WebView or HybridWebView on cold-start by @BagavathiPerumal in [Android] Fix for Android RefreshView incorrectly triggering pull-to-refresh when scrolling inside WebView or HybridWebView on cold-start #35633
🔧 Fixes
RefreshViewincorrectly refreshes when pulling inside a pre-scrolledWebViewinternal scroll container[iOS] Fix RefreshView causes CollectionView scroll position to reset by @devanathan-vaithiyanathan in [iOS] Fix RefreshView causes CollectionView scroll position to reset #31376
🔧 Fixes
SafeArea
Fix MauiView leaks detached platform views when SafeAreaEdges includes SoftInput by @KarthikRajaKalaimani in Fix MauiView leaks detached platform views when SafeAreaEdges includes SoftInput #35586
🔧 Fixes
Fix safe area CSS in Blazor Hybrid templates for Android by @mattleibow via @copilot in Fix safe area CSS in Blazor Hybrid templates for Android #34463
🔧 Fixes
[Android] Shell Flyout: Apply safe-area insets to the flyout container by @devanathan-vaithiyanathan in [Android] Shell Flyout: Apply safe-area insets to the flyout container #34510
🔧 Fixes
ScrollView
[iOS] Fix ScrollView with RTL FlowDirection and Horizontal Orientation scrolls in the wrong direction by @devanathan-vaithiyanathan in [iOS] Fix ScrollView with RTL FlowDirection and Horizontal Orientation scrolls in the wrong direction #32529
🔧 Fixes
[iOS] ScrollView: Fix landscape safe-area handling around the notch by @KarthikRajaKalaimani in [iOS] ScrollView: Fix landscape safe-area handling around the notch #35533
🔧 Fixes
[iOS] Fix ScrollView does not resize when children are removed from StackLayout at runtime by @devanathan-vaithiyanathan in [iOS] Fix ScrollView does not resize when children are removed from StackLayout at runtime #32267
🔧 Fixes
[Android] Fix: TapGestureRecognizer not firing on horizontal ScrollView by @Shalini-Ashokan in [Android] Fix: TapGestureRecognizer not firing on horizontal ScrollView #35897
🔧 Fixes
[Android] Fix ScrollView scroll position changes unexpectedly when Orientation is set to Horizontal and FlowDirection is RTL at runtime by @devanathan-vaithiyanathan in [Android] Fix ScrollView scroll position changes unexpectedly when Orientation is set to Horizontal and FlowDirection is RTL at runtime #32531
🔧 Fixes
Searchbar
[Mac]Clear button not hidden when text is cleared by @devanathan-vaithiyanathan in [Mac]Clear button not hidden when text is cleared #34737
🔧 Fixes
Shapes
Shell
Fix Shell.Title binding in TitleView by @jfversluis in Fix Shell.Title binding in TitleView #35800
🔧 Fixes
[Android] Fix SearchHandler.ClearPlaceholderEnabled not updated dynamically by @SyedAbdulAzeemSF4852 in [Android] Fix SearchHandler.ClearPlaceholderEnabled not updated dynamically #35777
🔧 Fixes
[iOS, Mac] Fix Shell back button history menu does not update after runtime change by @HarishwaranVijayakumar in [iOS, Mac] Fix Shell back button history menu does not update after runtime change #35542
🔧 Fixes
[iOS 26] Fix Shell TitleView not resizing on device rotation by @SyedAbdulAzeemSF4852 in [iOS 26] Fix Shell TitleView not resizing on device rotation #35883
🔧 Fixes
[Android] Fix Shell SearchHandler toolbar icon tint by @erikzhang in [Android] Fix Shell SearchHandler toolbar icon tint #36016
🔧 Fixes
[Windows] Fix for MenuFlyoutItem displaying icon in monochrome instead of original colors by @SyedAbdulAzeemSF4852 in [Windows] Fix for MenuFlyoutItem displaying icon in monochrome instead of original colors #32522
🔧 Fixes
Fix SearchHandler.QueryIcon, ClearIcon, and ClearPlaceholderIcon do not update dynamically at runtime by @SubhikshaSf4851 in Fix SearchHandler.QueryIcon, ClearIcon, and ClearPlaceholderIcon do not update dynamically at runtime #35893
🔧 Fixes
[iOS] Fix transparent Shell navigation bar appearing opaque after keyboard dismiss by @Shalini-Ashokan in [iOS] Fix transparent Shell navigation bar appearing opaque after keyboard dismiss #35960
🔧 Fixes
[Android] ScrollView doesn't work in the Shell Flyout Header by @KarthikRajaKalaimani in [Android] ScrollView doesn't work in the Shell Flyout Header #33192
🔧 Fixes
Fix Shell Navigating event not firing on ShellContent change by @jpd21122012 in Fix Shell Navigating event not firing on ShellContent change #34351
🔧 Fixes
Fix Shell flyout item template does not update selected visuals after DynamicResource changes by @devanathan-vaithiyanathan in Fix Shell flyout item template does not update selected visuals after DynamicResource changes #35155
🔧 Fixes
[iOS] Fix Shell Flyout SafeArea Rendering by @devanathan-vaithiyanathan in [iOS] Fix Shell Flyout SafeArea Rendering #33335
🔧 Fixes
SwipeView
[Windows] Fix SwipeItem IsVisible not refreshing native swipe items when binding changes by @SubhikshaSf4851 in [Windows] Fix SwipeItem IsVisible not refreshing native swipe items when binding changes #35361
🔧 Fixes
Fix build error caused by duplicate property change registration in SwipeItem by @SubhikshaSf4851 in Fix build error caused by duplicate property change registration in SwipeItem #35884
Fix SwipeView Threshold changes width and offset of the side menu (when visible) by @KarthikRajaKalaimani in Fix SwipeView Threshold changes width and offset of the side menu (when visible) #34923
🔧 Fixes
Fix: WebView inside SwipeView not responding to swipe gestures on Android by @SubhikshaSf4851 in Fix: WebView inside SwipeView not responding to swipe gestures on Android #36231
🔧 Fixes
Templates
Titlebar
[Mac] Fix Titlebar content is not aligned to left on fullscreen by @devanathan-vaithiyanathan in [Mac] Fix Titlebar content is not aligned to left on fullscreen #30378
🔧 Fixes
WebView
[iOS] Fixed Webview LoadFile ignore directories. by @NirmalKumarYuvaraj in [iOS] Fixed Webview LoadFile ignore directories. #31040
🔧 Fixes
LoadFileinsrc/Core/src/Platform/iOS/MauiWKWebView.csignore directories.[Android] Fix RenderThread SIGSEGV crash with multiple auto-sizing WebViews in ScrollView by @praveenkumarkarunanithi in [Android] Fix RenderThread SIGSEGV crash with multiple auto-sizing WebViews in ScrollView #35822
🔧 Fixes
[Android] Fix WebView.CanGoBack() returning true on first navigated page due to synthetic about:blank history entry by @praveenkumarkarunanithi in [Android] Fix WebView.CanGoBack() returning true on first navigated page due to synthetic about:blank history entry #35841
🔧 Fixes
[iOS] Fix WebView.Reload() with HtmlWebViewSource returns WebNavigationResult.Failure in Navigated event by @devanathan-vaithiyanathan in [iOS] Fix WebView.Reload() with HtmlWebViewSource returns WebNavigationResult.Failure in Navigated event #30625
🔧 Fixes
Window
Fixed Incorrect Window.Y and Window.Height values when closing a maximized window by @Dhivya-SF4094 in Fixed Incorrect Window.Y and Window.Height values when closing a maximized window #29253
🔧 Fixes
Xaml
🔧 Fixes
Fix AdaptiveTrigger memory leak when VisualStateGroups are replaced after attach by @Shalini-Ashokan in Fix AdaptiveTrigger memory leak when VisualStateGroups are replaced after attach #36240
🔧 Fixes
🔧 Infrastructure (6)
🧪 Testing (3)
[Android][Testing] Add dedicated CI stage for SafeAreaEdges tests on API 36 (Pixel 3 XL) by @NafeelaNazhir in [Android][Testing] Add dedicated CI stage for SafeAreaEdges tests on API 36 (Pixel 3 XL) #31631
🔧 Fixes
Fix build failure caused by Issue36154 by @SubhikshaSf4851 in Fix build failure caused by Issue36154 #36296
[Testing] SafeArea Feature Matrix Test Cases for ContentView by @TamilarasanSF4853 in [Testing] SafeArea Feature Matrix Test Cases for ContentView #36065
📦 Other (5)
Don't pack .NET Standard by @mattleibow in Don't pack .NET Standard #32203
Support shared/custom Platforms folder mappings in SingleProject by @Redth in Support shared/custom Platforms folder mappings in SingleProject #35045
🔧 Fixes
[CV2][Mac] Fix Vertical List page slows down when resizing the window by @devanathan-vaithiyanathan in [CV2][Mac] Fix Vertical List page slows down when resizing the window #32726
🔧 Fixes
[Android] Fix status bar icon contrast with custom colorPrimary by @jpd21122012 in [Android] Fix status bar icon contrast with custom colorPrimary #36214
🔧 Fixes
Revert unwanted changes in 1835d7f
📝 Issue References
Fixes #4715, Fixes #6016, Fixes #8680, Fixes #11764, Fixes #13323, Fixes #14894, Fixes #16119, Fixes #19667, Fixes #20586, Fixes #22326, Fixes #22507, Fixes #22634, Fixes #22642, Fixes #22683, Fixes #23023, Fixes #23315, Fixes #24533, Fixes #25689, Fixes #28064, Fixes #29066, Fixes #29131, Fixes #29421, Fixes #29898, Fixes #30081, Fixes #30248, Fixes #30515, Fixes #31065, Fixes #31808, Fixes #31824, Fixes #31892, Fixes #32059, Fixes #32221, Fixes #32271, Fixes #32275, Fixes #32435, Fixes #32724, Fixes #32796, Fixes #32832, Fixes #32987, Fixes #33103, Fixes #33110, Fixes #33307, Fixes #33785, Fixes #33833, Fixes #34100, Fixes #34103, Fixes #34257, Fixes #34307, Fixes #34318, Fixes #34422, Fixes #34462, Fixes #34536, Fixes #34931, Fixes #35042, Fixes #35216, Fixes #35386, Fixes #35410, Fixes #35471, Fixes #35490, Fixes #35564, Fixes #35571, Fixes #35572, Fixes #35583, Fixes #35613, Fixes #35650, Fixes #35675, Fixes #35700, Fixes #35736, Fixes #35752, Fixes #35753, Fixes #35755, Fixes #35761, Fixes #35764, Fixes #35771, Fixes #35785, Fixes #35788, Fixes #35795, Fixes #35796, Fixes #35806, Fixes #35809, Fixes #35837, Fixes #35839, Fixes #35844, Fixes #35859, Fixes #35860, Fixes #35862, Fixes #35902, Fixes #35943, Fixes #36010, Fixes #36015, Fixes #36018, Fixes #36032, Fixes #36033, Fixes #36035, Fixes #36059, Fixes #36154, Fixes #36173