428859 patches from quickstart branch
Merge remote-tracking branch 'upstream/master' into quick-start