Merge branch 'hotfix/Gamma.1'
improve variable name
Merge branch 'hotfix/Gamma.2' into develop