Code review changes
Merge branch 'v2_wiki_codeReviewChanges' into develop
Merge pull request #756 from heidiso/develop

V2 WikiPage - Code review changes