Security updates
merged latest security updates from test/options branch