Merge branch 'bugfix/websub-hardening' into 'develop'