Security enhancements

From C-7KDB897