[Merge Request] Guardian 2.0