drill

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

#2683

Merged