Re #9468. Moved struct definition to an anonymous namespace.
Merge branch 'bugfix/9468_sort_table' into develop