Sync upstream ussuri into arcus/ussuri-staging

I've pushed the arcus/train-staging branch to arcus/ussuri-staging. The diff on this merge request should show the differences between train and ussuri.