Wiki dao changes [PLFM-2274/ PLFM-2150]