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