Merge branch 'tube-clamp'