CSI 2.5 support

Common Security Infrastructure (CSI) 2.5 support includes:

New features are based on the existing security infrastructure.