Merge branch 'hotfix/tweak_honeypot'
removed field_name in error message
Merge branch 'hotfix/honeypotagain' into develop