Merge "Fix raw use of Gauge"