Architectural Manager Updates (Patch 4.7.22)