Merge branch 'atags' into integrator