drill

[BACKPORT-TO-STABLE] Bugfix Release 1.20.2 Phase 2

#2598

Closed