Release 0.08.25
Merged