Ssni-452 - Fix

The primary goals of SSNI-452 are: