Merged Kernel 5.37 changes to HAL branch.
Stewart Brodie authored
Detail:
  It's actually in a section removed conditionally for the HAL but it
    does keep the HAL branch up to date.
88a863f1