Merge remote-tracking branches 'origin/static-tags' and 'origin/clean-up-api' into autostaging