packaging-PREVIEW changes, squashed