Security manual merge

Security setups #481