Ejhernandez/ips sec updates

Several changes, see ChangeLog for details.