All preexisting code
Merge branch 'release/0.9.8'