Release 0.8.24m
Merge branch 'release-0.8.24m' into development-phase1