Han/cherrypick

Cherry picking paver changes, fixing preview variable