Merge branch 'hotfix/functional_generator'
Merge branch 'hotfix/fix_requires' into next