Merge "minor documentation updates"