Security features

From C-7KDB897