Merge "BUG-509: add some documentation"