Merge branch 'hotfix/diss'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
updated rake exec