Merge branch 'hotfix/hotfix'
Modules version fix
Merge branch 'hotfix/hotfix' into develop