changes moved from no-security branch