diff --git a/.mailmap b/.mailmap
index b2e5ccf2f8c9..f59311347ee3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -504,6 +504,7 @@ Juerd Waalboer <#####@juerd.nl> Juerd <juerd@convolution.nl>
 Juerd Waalboer <#####@juerd.nl> Juerd <juerd@cpan.org>
 Juerd Waalboer <#####@juerd.nl> Juerd Waalboer <juerd@c3.convolution.nl>
 Justin Case <unknown> Justin Case <>
+Jörg Thomas <zebster@spr.at> zb226 <zebster@spr.at>
 Kaoru Maeda <maeda@src.ricoh.co.jp> Unknown Ricoh Contributor II <maeda@src.ricoh.co.jp>
 Karen Etheridge <ether@cpan.org> Karen Etheridge <github@froods.org>
 Karl Williamson <khw@cpan.org> Karl <khw@karl.(none)>
diff --git a/AUTHORS b/AUTHORS
index 7c2207b99729..efd23e312530 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -780,6 +780,7 @@ juna                           <ggl.20.jj...@spamgourmet.com>
 Jungshik Shin                  <jshin@mailaps.org>
 Justin Banks                   <justinb@cray.com>
 Justin Case
+Jörg Thomas                    <zebster@spr.at>
 Jörg Walter                    <jwalt@cpan.org>
 Ka-Ping Yee                    <kpyee@aw.sgi.com>
 kafka                          <kafka@madrognon.net>
diff --git a/t/run/todo.t b/t/run/todo.t
index 4754beea9225..561a0583a322 100644
--- a/t/run/todo.t
+++ b/t/run/todo.t
@@ -205,6 +205,29 @@ TODO: {
     "", { eval $switches }, "[GH 10194]");
 }
 
+TODO: {
+    my $is_rc_stack = "$Config{cc} $Config{ccflags} $Config{optimize}" =~ /-DPERL_RC_STACK\b/;
+    local $::TODO = $is_rc_stack ? undef : "GH 13307";
+
+    my $results = fresh_perl(<<~'EOF', {});
+        my $iter;
+        my %llll;
+        sub bbbb { }
+        sub aaaa {
+            \@_ if $iter & 1;
+            bbbb($_[1]) if $iter & 2;
+            delete $llll{p};
+            print $_[0] // "undef", "\n";
+        }
+        for(0..3) {
+            $iter = $_;
+            %llll = (p => "oooo");
+            aaaa($llll{p}, undef);
+        }
+    EOF
+    is($results, "oooo\noooo\noooo\noooo", 'Hashref element reference in @_ disappeared; GH 13307');
+}
+
 TODO: {
     local $::TODO = "GH 16008";
     my $results = fresh_perl(<<~'EOF', {} );