re #7356 sort version 2 as well
Merge branch 'feature/7356_getei_wiki_error' into develop