Merge "STL clean-up DraggableHandler" into main