improve history and tab usage
Merge branch 'master' into linux-server