Merge pull request #2342 from MikeCol/tube8