Merge branch 'hotfix/1.24a'
minor improvements
Merge branch 'hotfix/1.24b' into develop