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