Merge branch 'static-tags' into autostaging