Development merge into master

Security fix, database details obfuscated