Extended Threat Scenarios
Merged conflicts.