Merge branch 'main' into LY-110648

Code/Tools/AssetProcessor/native/utilities/assetUtils.cpp

@@ -713,7 +713,7 @@ namespace AssetUtilities
         }
 
         // Update Settings Registry with new token
-        AZStd::string azNewAllowedList{ newAllowedList.join(', ').toUtf8().constData() };
+        AZStd::string azNewAllowedList{ newAllowedList.join(',').toUtf8().constData() };
         settingsRegistry->Set(allowedListKey, azNewAllowedList);
 
         return AssetUtilsInternal::DumpAssetProcessorUserSettingsToFile(*settingsRegistry, assetProcessorUserSetregPath);

Code/Tools/RC/ResourceCompiler/main.cpp

@@ -579,6 +579,8 @@ int rcmain(int argc, char** argv, [[maybe_unused]] char** envp)
             // on the command line
             AZ::CommandLine commandLine;
             commandLine.Parse(argc, argv);
+            AZ::SettingsRegistryMergeUtils::ParseCommandLine(commandLine);
+
             AZ::SettingsRegistryImpl settingsRegistry;
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_Bootstrap(settingsRegistry);
             AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_O3deUserRegistry(settingsRegistry, AZ_TRAIT_OS_PLATFORM_CODENAME, {});