Following upstream
A few bugs were fixed and added system guard EPA which will monitor all other EPAs