diff --git a/changelog/62439.fixed b/changelog/62439.fixed
new file mode 100644
index 00000000000..5863b52c2d2
--- /dev/null
+++ b/changelog/62439.fixed
@@ -0,0 +1 @@
+When handling aggregation, change the order to ensure that the requisites are aggregated first and then the state functions are aggregated.  Caching whether aggregate functions are available for particular states so we don't need to attempt to load them everytime.