Merge remote-tracking branch 'origin/clean-up-api' into autostaging