diff --git a/charclass_invlists.inc b/charclass_invlists.inc
index 8086ca8bfb35..3067795c4bdf 100644
--- a/charclass_invlists.inc
+++ b/charclass_invlists.inc
@@ -456662,7 +456662,7 @@ static const U8 WB_dfa_table[] = {
 #endif	/* defined(PERL_IN_REGEXEC_C) */
 
 /* Generated from:
- * 6cbf3f0fc04bbb22420eb9689126b5030bd714ad06397d0904702714feabe28e lib/Unicode/UCD.pm
+ * 2646270ff0dac23e79b18846d33918fba25b80b624e613a69accc3c0f9a0f51b lib/Unicode/UCD.pm
  * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt
  * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt
  * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt
diff --git a/lib/Unicode/UCD.pm b/lib/Unicode/UCD.pm
index 715463b03cbd..61a985948cc5 100644
--- a/lib/Unicode/UCD.pm
+++ b/lib/Unicode/UCD.pm
@@ -2533,6 +2533,8 @@ change these into digits, and then call C<num> on the result.
 
 sub num ($;$) {
     my ($string, $retlen_ref) = @_;
+    croak __PACKAGE__, "::num: second parameter must be a scalar reference"
+                        if defined $retlen_ref && ref $retlen_ref ne "SCALAR";
 
     use feature 'unicode_strings';
 
diff --git a/lib/Unicode/UCD.t b/lib/Unicode/UCD.t
index d58096b0c9f2..582068e5939f 100644
--- a/lib/Unicode/UCD.t
+++ b/lib/Unicode/UCD.t
@@ -834,6 +834,13 @@ is($ret_len, 5, "... and the returned length is 5");
 ok(! defined num("98765\N{FULLWIDTH DIGIT FOUR}", \$ret_len),
    'Verify num("98765\N{FULLWIDTH DIGIT FOUR}") isnt defined');
 is($ret_len, 5, "... but the returned length is 5");
+{
+    local $@;
+    my $ret_len = [ 5 ];
+    eval { num("98765", \$ret_len); };
+    like($@, qr/::num: second parameter must be a scalar reference/,
+        "num: Incorrect type for second parameter; must be scalar ref");
+}
 my $tai_lue_2;
 if ($v_unicode_version ge v4.1.0) {
     my $tai_lue_1 = charnames::string_vianame("NEW TAI LUE DIGIT ONE");
diff --git a/lib/unicore/uni_keywords.pl b/lib/unicore/uni_keywords.pl
index 16ea1c04b10d..50e713a6ac18 100644
--- a/lib/unicore/uni_keywords.pl
+++ b/lib/unicore/uni_keywords.pl
@@ -1353,7 +1353,7 @@
 1;
 
 # Generated from:
-# 6cbf3f0fc04bbb22420eb9689126b5030bd714ad06397d0904702714feabe28e lib/Unicode/UCD.pm
+# 2646270ff0dac23e79b18846d33918fba25b80b624e613a69accc3c0f9a0f51b lib/Unicode/UCD.pm
 # 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt
 # b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt
 # d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt
diff --git a/regcharclass.h b/regcharclass.h
index 622a22bc7ff4..ec7abf745666 100644
--- a/regcharclass.h
+++ b/regcharclass.h
@@ -3801,7 +3801,7 @@
 #endif /* PERL_REGCHARCLASS_H_ */
 
 /* Generated from:
- * 6cbf3f0fc04bbb22420eb9689126b5030bd714ad06397d0904702714feabe28e lib/Unicode/UCD.pm
+ * 2646270ff0dac23e79b18846d33918fba25b80b624e613a69accc3c0f9a0f51b lib/Unicode/UCD.pm
  * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt
  * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt
  * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt
diff --git a/regexp_constants.h b/regexp_constants.h
index a6a8d78e465f..21693b5cdb7b 100644
--- a/regexp_constants.h
+++ b/regexp_constants.h
@@ -29,7 +29,7 @@
 #define MAX_FOLD_FROMS 3
 
 /* Generated from:
- * 6cbf3f0fc04bbb22420eb9689126b5030bd714ad06397d0904702714feabe28e lib/Unicode/UCD.pm
+ * 2646270ff0dac23e79b18846d33918fba25b80b624e613a69accc3c0f9a0f51b lib/Unicode/UCD.pm
  * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt
  * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt
  * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt
diff --git a/uni_keywords.h b/uni_keywords.h
index edb6bb50cd48..bb66183ec4cf 100644
--- a/uni_keywords.h
+++ b/uni_keywords.h
@@ -7997,7 +7997,7 @@ match_uniprop( const unsigned char * const key, const U16 key_len ) {
 #endif /* #if defined(PERL_CORE) || defined(PERL_EXT_RE_BUILD) */
 
 /* Generated from:
- * 6cbf3f0fc04bbb22420eb9689126b5030bd714ad06397d0904702714feabe28e lib/Unicode/UCD.pm
+ * 2646270ff0dac23e79b18846d33918fba25b80b624e613a69accc3c0f9a0f51b lib/Unicode/UCD.pm
  * 764f420cedfc8b43d9fec251c957a5d55fc45d40f6573f162990ed1dce7e36e0 lib/unicore/ArabicShaping.txt
  * b8f32554c6f658821fb0ee742d21c5b1f2086b9bf13071fed04894b022f93d67 lib/unicore/BidiBrackets.txt
  * d7afdadd1bbd66f5a663ac0e8f7958f18fd9491fc0bc59ec5877cb82db71db7d lib/unicore/BidiMirroring.txt