Bug fixed.
Merge branch 'master' into show-hide-table