Using new staging
Merge branch 'master' into manager-endpoints