Sync documentation with trunk

- Synced documentation with trunk