diff --git a/icu4c/source/data/locales/fa_AF.txt b/icu4c/source/data/locales/fa_AF.txt
index c3b9a5e8850..f2945433d9d 100644
--- a/icu4c/source/data/locales/fa_AF.txt
+++ b/icu4c/source/data/locales/fa_AF.txt
@@ -14,8 +14,8 @@ fa_AF {
 //        "\u0642.\u0638.",
 //        "\u0628.\u0638.",
 //    }
-    // Use the fa rules instead
     // This is a unified sort with uz_AF, fa_AF and ps.
+    CollationElements:alias { "ps" }
 //    CollationElements {
 //        Version { "1.0" }
 //        Sequence { "[normalization on]"
@@ -33,7 +33,7 @@ fa_AF {
 //           "&\u0648<<\u0624<<\u06c7<<\u06c9"
 //           "&\u0647<<<\u06c0<<<\u0647\u0654<<\u06d5<<\u06c1<<\u06be<<\u0629<<\u06c3"
 //           "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06cd<<\u06cc\u0654<<<\u0649\u0654<<<\u0626"
-////           "&\u00a0<<\u200c<<\u200d"  // This is NBSP << ZWNJ << ZWJ Don't use them in collation rules!
+//           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
 //         }
 //    }
     Countries {
diff --git a/icu4c/source/data/locales/ps.txt b/icu4c/source/data/locales/ps.txt
index bcd9fa705b6..1c4f715dc66 100644
--- a/icu4c/source/data/locales/ps.txt
+++ b/icu4c/source/data/locales/ps.txt
@@ -17,26 +17,26 @@ ps {
         "\u063a.\u0648.",
     }
     // This is a unified sort with uz_AF, fa_AF and ps.
-//    CollationElements {
-//        Version { "1.0" }
-//        Sequence { "[normalization on]"
-//           "&\u064e << \u0650 << \u064f << \u064b << \u064d << \u064c"
-//           "&\u0622 < \u0627 << \u0623 << \u0672 << \u0671 << \u0625 << \u0673 < \u0621"
-//           "&\u062a < \u067c << \u0679"
-//           "&\u062c < \u0681 << \u062d\u0654"
-//           "&\u0686 < \u0685"
-//           "&\u062f < \u0689 << \u0688"
-//           "&\u0631 < \u0693 << \u0691"
-//           "&\u0698 < \u0696"
-//           "&\u06a9 << \u06aa << \u0643"
-//           "&\u06ab << \u06af"
-//           "&\u06bc << \u06bb"
-//           "&\u0648 << \u0624 << \u06c7 << \u06c9"
-//           "&\u0647 <<< \u06c0 <<< \u0647\u0654 << \u06d5 << \u06c1 << \u06be << \u0629 << \u06c3"
-//           "&\u06cc << \u0649 << \u06d2 << \u064a << \u06d0 << \u06cd << \u06cc\u0654 <<< \u0649\u0654 <<< \u0626"
-////           "&\u00a0<<\u200c<<\u200d"  // This is NBSP << ZWNJ << ZWJ Don't use them in collation rules!
-//         }
-//    }
+    CollationElements {
+        Version { "1.0" }
+        Sequence { "[normalization on]"
+           "&\u064e<<\u0650<<\u064f<<\u064b<<\u064d<<\u064c"
+           "&\u0622<\u0627<<\u0623<<\u0672<<\u0671<<\u0625<<\u0673<\u0621"
+           "&\u062a<\u067c<<\u0679"
+           "&\u062c<\u0681<<\u062d\u0654"
+           "&\u0686<\u0685"
+           "&\u062f<\u0689<<\u0688"
+           "&\u0631<\u0693<<\u0691"
+           "&\u0698<\u0696"
+           "&\u06a9<<\u06aa<<\u0643"
+           "&\u06ab<<\u06af"
+           "&\u06bc<<\u06bb"
+           "&\u0648<<\u0624<<\u06c7<<\u06c9"
+           "&\u0647<<<\u06c0<<<\u0647\u0654<<\u06d5<<\u06c1<<\u06be<<\u0629<<\u06c3"
+           "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06cd<<\u06cc\u0654<<<\u0649\u0654<<<\u0626"
+           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
+         }
+    }
     Countries {
         AF  { "\u0627\u0641\u063a\u0627\u0646\u0633\u062a\u0627\u0646" }
         AL  { "\u0627\u0644\u0628\u0627\u0646\u06cc\u0647" }
diff --git a/icu4c/source/data/xml/experimental/uz_AF.txt b/icu4c/source/data/xml/experimental/uz_AF.txt
index 207e74e03c4..e5148f73bc6 100644
--- a/icu4c/source/data/xml/experimental/uz_AF.txt
+++ b/icu4c/source/data/xml/experimental/uz_AF.txt
@@ -7,10 +7,14 @@
 //
 // Created by Roozbeh Pournader <roozbeh@sharif.edu> and Michael Everson <everson@evertype.com>
 
+// WARNING: This locale is a different script from uz and uz_UZ.
+//      This locale will be changed once ICU implements ISO-3066 locale names.
+
 uz_AF {
     Version { "x0.1" }
 
     // This is a unified sort with uz_AF, fa_AF and ps.
+    CollationElements:alias { "ps" }
 //    CollationElements {
 //        Version { "1.0" }
 //        Sequence { "[normalization on]"
@@ -28,7 +32,7 @@ uz_AF {
 //           "&\u0648 << \u0624 << \u06c7 << \u06c9"
 //           "&\u0647 <<< \u06c0 <<< \u0647\u0654 << \u06d5 << \u06c1 << \u06be << \u0629 << \u06c3"
 //           "&\u06cc << \u0649 << \u06d2 << \u064a << \u06d0 << \u06cd << \u06cc\u0654 <<< \u0649\u0654 <<< \u0626"
-////           "&\u00a0<<\u200c<<\u200d"  // This is NBSP << ZWNJ << ZWJ Don't use them in collation rules!
+//           "&'\u00a0'<<'\u200c'<<'\u200d'"  // This is NBSP << ZWNJ << ZWJ
 //         }
 //    }
 
@@ -77,7 +81,7 @@ uz_AF {
         "\u0642.\u0645.",
         "\u0645.", //MoE additionally suggests "\u0639."
     }
-//    ExemplarCharacters{"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a\u064b-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06af\u06bc\u06c7\u06c9\u06cc-\u06cd\u06d0]"}
+    ExemplarCharacters{"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064a\u064b-\u0652\u0654\u0670\u067c\u067e\u0681\u0685-\u0686\u0689\u0693\u0696\u0698\u069a\u06a9\u06ab\u06af\u06bc\u06c7\u06c9\u06cc-\u06cd\u06d0]"}
 
     Languages {        
         fa { "\u062f\u0631\u06cc" }