428859 patches from quickstart branch