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