Pla 788

!! Don't merge. Code review !!

ApiDocs worning for non-public wikis.