Merge branch 'bugfix/relax-spam-protection' into 'develop'