Merge pull request #55 from apache/backport_9008

Backport 9008, add latest docs