drill

Drill 7882 + Drill 7883 - Fix LGTM Alerts in /common and /contrib

#2191

Closed