Merging development branch v0.9.8 stable