Security Joernchen

Merged username-removed-5302 requested to merge security_joernchen into master