Merge branch 'master' into Adar
summary: add gauges
Merge branch 'Adar'