CE-1018 Wiki-related tasks refactored