rebase from upstream and enable temp path change