Merge "Document Updates and Bug Fixes"