Merge branch 'Adar'
visual: gauge
Merge branch 'master' into Adar