v1.6.x

PR from bug fix to 1.6.x branch.