bug fix
Merge remote-tracking branch 'origin/i20' into drill-master