added Rons changes for configuration and security
Merge remote-tracking branch 'upstream/master'