Merge branch 'hotfix/translatefix'
Merge branch 'hotfix/translatefix'
Merge branch 'release/2.0.0rc8'
Merge branch 'develop'
rename variable
Merge branch 'hotfix/renameVariable' into develop