Some improves in TableView.
Some improves in TableView.
Merge remote-tracking branch 'origin/master'