Table sorting works again
Merge remote-tracking branch 'origin/master'
Table sorting works again