[PATCH 0/4] Remediation Templates