Merge "Refactor security classes for static initialization"