test updates
Merge branch 'staging' into gh-1125