Merge "doc: various updates"