Merge branch 'hotfix/hotfix'
Module update fix
Merge branch 'hotfix/hotfix' into develop