Merge branch 'hotfix/fix-helpers-reg' into develop

* hotfix/fix-helpers-reg:
  Fix helpers registration failing in prod.
Changelog
Merge branch 'develop'

* develop:
  Changelog