Merge remote-tracking branch 'origin/release/dev16.9-vs-deps' into merges/release/dev16.9-vs-deps-to-release/dev16.11-vs-deps