Merge branch 'doc/sort_the_forum'