[PATCH 14/22] New remediation template