Gauge display branch to be merge to master