Merge "Document reentrancy and error conditions" into jb-mr1-dev