[PATCH 08/22] Added remediation