Merge "Expose important thresholds for mitigation impacts" into main