Merge branch 'release-0.8.16' into development