diff --git a/indra/deps/CMakeLists.txt b/indra/deps/CMakeLists.txt
index 024ccfdaa84370ee0069e399d05a06fc03676dde..614c976ee1f6bdd60f64923230286a4d960e7e69 100644
--- a/indra/deps/CMakeLists.txt
+++ b/indra/deps/CMakeLists.txt
@@ -24,7 +24,7 @@ add_library(deps
 
 FetchContent_Declare(
   meshoptimizer
-  GIT_REPOSITORY https://git.alchemyviewer.org/alchemy/mirrors/meshoptimizer.git
+  GIT_REPOSITORY https://github.com/zeux/meshoptimizer.git
   GIT_TAG        v0.20
   GIT_SHALLOW TRUE
   GIT_PROGRESS TRUE
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 33c2dd0e83cc89a7e7631928db9296b1a6e1615c..e8138b6b44bd408312429b5a3ed7c3ae49a7d9c5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3216,7 +3216,13 @@ LLSD LLAppViewer::getViewerInfo() const
         url = LLTrans::getString("RELEASE_NOTES_BASE_URL");
         if (!LLStringUtil::endsWith(url, "/"))
             url += "/";
-        url += LLURI::escape(versionInfo.getVersion()) + ".html";
+        url += LLURI::escape(versionInfo.getVersion());
+        if (versionInfo.getViewerMaturity() == LLVersionInfo::BETA_VIEWER)
+            url += LLURI::escape("-beta");
+        else if (versionInfo.getViewerMaturity() == LLVersionInfo::PROJECT_VIEWER)
+            url += LLURI::escape("-project");
+        else if (versionInfo.getViewerMaturity() == LLVersionInfo::TEST_VIEWER)
+            url += LLURI::escape("-test");
     }
     info["VIEWER_RELEASE_NOTES_URL"] = url;
 
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index f95db4ce975e1f8bb389d9d967feb7e3ae70657a..5b44c252f7b7d20e00be500e724609265777f8b5 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -79,20 +79,20 @@
 				function="Advanced.ShowURL"
 				parameter="https://www.alchemyviewer.org/downloads"/>
 		</menu_item_call>
-		<menu_item_call
+        <menu_item_call
              label="Report Alchemy Bug"
              name="Report Alchemy Bug">
-			<menu_item_call.on_click
+            <menu_item_call.on_click
 				function="Advanced.ShowURL"
-				parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Bug"/>
-		</menu_item_call>
-		<menu_item_call
+				parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=bug%2Ctriage&projects=&template=10-bug.yaml"/>
+        </menu_item_call>
+        <menu_item_call
              label="Request Alchemy Improvement"
              name="Request Alchemy Improvement">
-			<menu_item_call.on_click
+            <menu_item_call.on_click
 				function="Advanced.ShowURL"
-				parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Improvement"/>
-		</menu_item_call>
+				parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=enhancement%2C+triage&projects=&template=20-enhancement.md&title=New+Feature"/>
+        </menu_item_call>
 		<menu_item_separator/>
         <menu_item_call
              label="Second Life Knowledge Base"
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7e4648eb48c5923fc909aa78705b3d2fd7790d01..d7baaf62ee1d48836ca3ea2654902d58eb18d47b 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2041,14 +2041,14 @@ function="World.EnvPreset"
              name="Report Alchemy Bug">
 			<menu_item_call.on_click
 				function="Advanced.ShowURL"
-				parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Bug"/>
+				parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=bug%2Ctriage&projects=&template=10-bug.yaml"/>
 		</menu_item_call>
 		<menu_item_call
              label="Request Alchemy Improvement"
              name="Request Alchemy Improvement">
 			<menu_item_call.on_click
 				function="Advanced.ShowURL"
-				parameter="https://git.alchemyviewer.org/alchemy/viewer/issues/new?issuable_template=Improvement"/>
+				parameter="https://github.com/AlchemyViewer/Alchemy/issues/new?assignees=&labels=enhancement%2C+triage&projects=&template=20-enhancement.md&title=New+Feature"/>
 		</menu_item_call>
 		<menu_item_separator/>
         <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 83f7fd4eb1140d9baa3630d3e38e1f28ec350f1b..eb112756f5d3da0ec58a3ab0c4158afd034488c4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3922,7 +3922,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
 You can either check your Internet connection and try again in a few minutes, click Help to view the [SUPPORT_SITE], or click Teleport to attempt to teleport home.
     <url option="1" name="url">
 
-			https://git.alchemyviewer.org/alchemy/alchemy-next/issues
+			https://github.com/AlchemyViewer/Alchemy/issues
     </url>
     <form name="form">
       <button
@@ -3950,7 +3950,7 @@ We&apos;re having trouble connecting. There may be a problem with your Internet
 
 You can either check your Internet connection and try again in a few minutes or click Help to view the [SUPPORT_SITE].
     <url option="1" name="url">
-			https://git.alchemyviewer.org/alchemy/alchemy-next/issues
+			https://github.com/AlchemyViewer/Alchemy/issues
     </url>
     <form name="form">
       <button
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 937c6af9aaec48ac3084eb0a2bf3b667e8abc6ef..cef6aa18083a84c133a3bfd16323911c0ad3a528 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -361,7 +361,7 @@ are allowed.
 
 	<string name="ReleaseNotes">Release Notes</string>
 	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
-	<string name="RELEASE_NOTES_BASE_URL" translate="false">https://git.alchemyviewer.org/alchemy/alchemy/releases/</string>
+	<string name="RELEASE_NOTES_BASE_URL" translate="false">https://github.com/AlchemyViewer/Alchemy/releases/tag/</string>
 
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 7ec8658ec2544a87a4bb589b7a1d1454aae91e46..13324a03ac8a56ca7393daa64bb3982d9432f3de 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -1910,7 +1910,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 
 インターネット接続を確認してから数分後に再接続するか、ヘルプをクリックして [SUPPORT_SITE]をご覧になるか、テレポートをクリックしてホームに移動してみてください。
 		<tag>fail</tag>
-		<url name="url">https://git.alchemyviewer.org/alchemy/alchemy-next/issues</url>
+		<url name="url">https://github.com/AlchemyViewer/Alchemy/issues</url>
 		<form name="form">
 			<button name="OK" text="ＯＫ"/>
 			<button name="Help" text="ヘルプ"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 49bf456b633e7eab248e92d865d7064c86d1dd59..65b1e52561cbd3e9140c82ea07dba662a3975d28 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -743,7 +743,7 @@ https://secondlife.com/viewer-access-faq
 	</string>
 	<!-- Always mark translate="false" for strings that are nothing but URLs, as they don't need translation. -->
 	<string name="RELEASE_NOTES_BASE_URL" translate="false">
-		https://git.alchemyviewer.org/alchemy/alchemy/releases/
+		https://github.com/AlchemyViewer/Alchemy/releases/tag/
 	</string>
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">