Master - add delete tube hotfix