DRILL-256 revised patch