Multi strategy

Bringing multi-strategy & multi-security changes into mainline.