Merge "Sticky huns dont get cleaned up properly" into tm-dev