Merge pull request #8112 from pingtux/testtube