load scrollbar when needed
Merge branch 'master' into test-interface