downstream preview changes (bug 1029765)