drill

[BACKPORT-TO-STABLE] Bugfix Release 1.20.3 Phase 3

#2724

Merged