Even more ObligationForest improvements
#64627
+85
−60
Merged