v0.6.16
Merge branch 'release-v0.6.16' into support/0.6.x
v0.6.16