minor improvements
Merge branch 'hotfix/1.24b'