Upgrade Proposal #13: OPCM and Incident Response improvements