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