Release 0.8.18b
Merge branch 'release-0.8.18b' into development