EE and SNA enhancements: Part 3

From C-7KDB897