Landed from contributor PR #28428 by @l0cka. Co-authored-by: Daniel Alkurdi <danielalkurdi@gmail.com>
Merged via squash. Prepared head SHA: efadda4988b460e6da07be72994d4951d64239d0 Co-authored-by: zerone0x <39543393+zerone0x@users.noreply.github.com> Co-authored-by: jalehman <550978+jalehman@users.noreply.github.com> Reviewed-by: @jalehman