Merge "Fix/update inline documentation in WikiPage class"