Merge branch 'preserve_gauges'