Merge "Fix broken docs in companion" into main