diff --git a/.github/ISSUE_TEMPLATE/ar_bug_report-md.md b/.github/ISSUE_TEMPLATE/ar_bug_report.md
similarity index 72%
rename from .github/ISSUE_TEMPLATE/ar_bug_report-md.md
rename to .github/ISSUE_TEMPLATE/ar_bug_report.md
index e2f64b88b8..0d4aee9397 100644
--- a/.github/ISSUE_TEMPLATE/ar_bug_report-md.md
+++ b/.github/ISSUE_TEMPLATE/ar_bug_report.md
@@ -1,17 +1,8 @@
---
name: ar_bug_report.md
about: Create a bug for a an issue found in the Automated Review
-title: ''
-labels: ''
-assignees: ''
-
----
-
----
-name: Automated Review Bug report
-about: Create a report when a failure occurs in main branch
-title: ''
-labels: 'Automated_Review'
+title: 'AR Bug Report'
+labels: 'needs-triage,kind/bug,kind/automation'
assignees: ''
---
diff --git a/.github/ISSUE_TEMPLATE/rfc-feature.md b/.github/ISSUE_TEMPLATE/rfc-feature.md
deleted file mode 100644
index 31a195f803..0000000000
--- a/.github/ISSUE_TEMPLATE/rfc-feature.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-name: RFC Feature request
-about: Create Feature RFC for this project
-title: Proposed RFC Feature =description=
-labels: 'rfc-feature'
-assignees: ''
-
----
-
-# O3DE RFC Feature Template
-
-### When using this template, you do not have to fill out every question below. The questions are there for guidance.
-
-This RFC feature template should be used for any feature that is not a bug or a substantial reorganization of the O3DE product.
-
-If you submit a pull request to implement a new feature without going through the RFC process, it may be closed with a polite request to submit an RFC first.
-
-A hastily proposed RFC can hurt its chances of acceptance. Low-quality proposals, proposals for previously-rejected features, or those that don't fit into the near-term roadmap may be quickly rejected, demotivating the unprepared contributor. Laying some groundwork ahead of the RFC can make the process smoother.
-
-Although there is no single way to prepare for submitting an RFC, it is generally a good idea to pursue feedback from other project developers beforehand to ascertain that the RFC may be desirable; having a consistent impact on the project requires concerted effort toward consensus-building.
-
-The most common preparations for writing and submitting an RFC include:
-- Talking the idea over on our Discord server.
-- Discussing the topic on our GitHub RFCs discussions page.
-- Occasionally posting "pre-RFCs" on the GitHub RFCs discussion page.
-You may file issues in the RFCs repo for discussion, but these are not actively looked at by the teams.
-
-As a rule of thumb, receiving encouraging feedback from long-standing project developers, and particularly members of the relevant sub-team, is a good indication that the RFC is worth pursuing.
-
-# ----- DELETE EVERYTHING FROM THE TOP TO THE SUMMARY LINE BELOW WHEN USING TEMPLATE ----- #
-
-### Summary:
-Single paragraph explanation of the feature
-
-### What is the relevance of this feature?
-Why is this important? What are the use cases? What will it do once completed?
-
-### Feature design description:
-- Explain the design of the feature with enough detail that someone familiar with the environment and framework can understand the concept and explain it to others.
-- It should include at least one end-to-end example of how a developer will use it along with specific details, including outlying use cases.
-
-- If there is any new terminology, it should be defined here.
-
-### Technical design description:
-- Explain the technical portion of the work in enough detail that members can implement the feature.
-
-- Explain any API or process changes required to implement this feature
-
-- This section should relate to the feature design description by reference and explain in greater detail how it makes the feature design examples work.
-
-- This should also provide detailed information on compatibility with different hardware platforms.
-
-
-### What are the advantages of the feature?
-- Explain the advantages for someone to use this feature
-
-### What are the disadvantages of the feature?
-- Explain any disadvantages for someone to use this feature
-
-### How will this be implemented or integrated into the O3DE environment?
-- Explain how a developer will integrate this into the codebase of O3DE and provide any specific library or technical stack requirements.
-
-### Are there any alternatives to this feature?
-- Provide any other designs that have been considered. Explain what the impact might be of not doing this.
-- If there is any prior art or approaches with other frameworks in the same domain, explain how they may have solved this problem or implemented this feature.
-
-### How will users learn this feature?
-- Detail how it can be best presented and how it is used as an extension or a standalone tool used with O3DE.
-- Explain if and how it may change how individuals would use the platform and if any documentation must be changed or reorganized.
-- Explain how it would be taught to new and existing O3DE users.
-
-### Are there any open questions?
-- What are some of the open questions and potential scenarios that should be considered?
diff --git a/.github/ISSUE_TEMPLATE/rfc-suggestion.md b/.github/ISSUE_TEMPLATE/rfc-suggestion.md
deleted file mode 100644
index 7c51bbc918..0000000000
--- a/.github/ISSUE_TEMPLATE/rfc-suggestion.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: RFC Suggestion request
-about: Create Suggestion RFC for this project
-title: Proposed RFC Suggestion =description=
-labels: 'rfc-suggestion'
-assignees: ''
-
----
-
-# O3DE Suggestion RFC Template
-
-### When using this template, you do not have to fill out every question below. The questions are there for guidance.
-
-This RFC template should be used for any suggestion that is not based upon code or content related to the O3DE product itself. This template is for proposing new process models, approaches, or ideas to improve the O3DE community.
-
-A hastily proposed RFC can hurt its chances of acceptance. Low-quality proposals, proposals for previously rejected features, or those that do not have any substantive value to the project may be quickly rejected, demotivating the unprepared contributor. Laying some groundwork with others in the community ahead of the RFC can make the process much smoother.
-
-Although there is no single way to prepare for submitting an RFC, it is generally a good idea to pursue feedback from other project members beforehand. Keep in mind that you want other members to contribute and back your suggestion, which can drastically improve the chances of implementation.
-
-The most common preparations for writing and submitting an RFC include:
-- Talking the idea over on our Discord server.
-- Creating a discussion on our GitHub RFCs discussions page.
-- Occasionally posting "pre-RFCs" on the GitHub RFCs discussion page.
-You may file issues in the RFCs repo for discussion, but these are not actively looked at by the teams.
-
-As a rule of thumb, receiving encouraging feedback from long-standing community members is a good indication that the RFC is worth pursuing.
-
-# ----- DELETE EVERYTHING FROM THE TOP TO THE SUMMARY LINE BELOW WHEN USING TEMPLATE ----- #
-
-### Summary:
-Single paragraph explanation of the suggestion
-
-### What is the motivation for this suggestion?
-Why is this important?
-What are the use cases for this suggestion?
-What should the outcome be if this suggestion is implemented?
-
-### Suggestion design description:
-- Explain the suggestion with enough detail that someone familiar with the process and environment of the project can understand the suggestion and explain it to others.
-- It should include at least one end-to-end example of how the community will use it along with the specific details with outlying use cases.
-
-- If there is any new terminology, it should be defined here.
-
-### What are the advantages of the suggestion?
-- Explain the advantages of using this suggestion
-
-### What are the disadvantages of the suggestion?
-- Explain any disadvantages or trade-offs to using this suggestion
-
-### How will this be work within the O3DE project?
-- Explain how this suggestion will be work within the O3DE project.
-
-### Are there any alternatives to this suggestion?
-- Provide any other alternative ways that have been considered.
-- Explain what the impact might be of not implementing this suggestion.
-- If there are other similar suggestions previously used, list them and explain which parts may have solved some or all of this problem.
-
-### What is the strategy for adoption?
-- Explain how new and existing users will adopt this suggestion.
-- Point out any efforts needed if it requires coordination with multiple SIGs or other projects.
-- Explain how it would be taught to new and existing O3DE users.
diff --git a/.gitignore b/.gitignore
index 664680c5bf..1b63c7698a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
.idea/
+.vs/
.vscode/
__pycache__
AssetProcessorTemp/**
[Bb]uild/**
+[Oo]ut/**
[Cc]ache/
/install/
Editor/EditorEventLog.xml
@@ -14,6 +16,8 @@ UserSettings.xml
FrameCapture/**
.DS_Store
user*.cfg
+client*.cfg
+server*.cfg
.mayaSwatches/
_savebackup/
#Output folder for test results when running Automated Tests
diff --git a/Assets/Editor/Icons/Components/AnimGraphNetSync.svg b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
new file mode 100644
index 0000000000..7bf70e69dc
--- /dev/null
+++ b/Assets/Editor/Icons/Components/AnimGraphNetSync.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/Animation.svg b/Assets/Editor/Icons/Components/Animation.svg
new file mode 100644
index 0000000000..4890bb0900
--- /dev/null
+++ b/Assets/Editor/Icons/Components/Animation.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/Assets/Editor/Icons/Components/AreaLight.svg b/Assets/Editor/Icons/Components/AreaLight.svg
index 932f02dd2e..a52c5d38c3 100644
--- a/Assets/Editor/Icons/Components/AreaLight.svg
+++ b/Assets/Editor/Icons/Components/AreaLight.svg
@@ -1,12 +1,10 @@